Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 25 Aug 2011 18:59:26 +0000 (11:59 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 25 Aug 2011 18:59:26 +0000 (11:59 -0700)
commit02dad38561d7f5499f4ca64130bd1d4a66c98bf3
tree344f842d9e59c3217b2d8f80d9ea2e3020db3011
parent66808a1b40884e807800211ed3cc6e0f328db41d
parentbab739ec97f34ab3ab36e3f7f2f50be7302752ea
Merge from trunk.